zlib: avoid waiting for paused ZIP iterators - #65278
Merged
Merged
Conversation
Track file-backed contentIterator() reads only while I/O is active. This lets ZipFile.close() finish when an iterator is paused after yielding a chunk, while still waiting for reads in flight. Signed-off-by: Kamat, Trivikram <16024985+trivikr@users.noreply.github.com> Assisted-by: codex:gpt-5.6-sol
This comment was marked as resolved.
This comment was marked as resolved.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #65278 +/- ##
==========================================
- Coverage 90.32% 90.32% -0.01%
==========================================
Files 751 751
Lines 250000 250007 +7
Branches 47231 47231
==========================================
+ Hits 225816 225821 +5
+ Misses 15566 15565 -1
- Partials 8618 8621 +3
🚀 New features to boost your workflow:
|
trivikr
added
the
zlib
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
There was a problem hiding this comment.
Pull request overview
Fixes a node:zlib ZipFile lifecycle bug where ZipFile.close() could hang if a file-backed ZipEntry.contentIterator() was paused after yielding a chunk, by only counting active I/O as “in-flight” work that close() must wait for.
Changes:
- Update file-backed ZIP entry streaming (
ZipEntry.#rawChunks()) to decrement the shared handle’sreadscounter before eachyield, and re-increment only when resuming to perform the next read. - Add a regression test covering
close()resolving while acontentIterator()is paused, and ensuring further iteration fails withERR_INVALID_STATE.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| test/parallel/test-zlib-zip-file-lifecycle.js | Adds regression coverage for ZipFile.close() behavior with a paused contentIterator(). |
| lib/internal/zip/entry.js | Refines in-flight read tracking for file-backed iterator reads to avoid counting time spent paused at yield. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
trivikr
added
review wanted
This comment was marked as outdated.
This comment was marked as outdated.
jasnell
approved these changes
Aug 29, 2026
trivikr
added
the
author ready
This comment was marked as outdated.
This comment was marked as outdated.
Collaborator
trivikr
added
the
commit-queue
Collaborator
|
Landed in 884f9cd |
nodejs-github-bot
removed
the
commit-queue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #65277
Track file-backed contentIterator() reads only while I/O is active. This lets ZipFile.close() finish when an iterator is paused after yielding a chunk, while still waiting for reads in flight.
Assisted-by: codex:gpt-5.6-sol